diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index dc95f58..f37a3d9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -8,12 +8,10 @@ import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.app.dict.AppUserOpenidDict; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; - import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.HttpClientBuilder; @@ -24,16 +22,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - import javax.annotation.Resource; import java.util.List; import java.util.Map; -import static com.casic.missiles.modular.app.dict.AppUserOpenidDict.APPUSER_LOGIN_LOG_KEY; - /** - * - * * @author dev * @Date 2020-05-24 11:21:45 */ @@ -47,6 +40,7 @@ @Value("${casic.wxUrl}") private String wxUrl; + /** * 获取授权列表 */ @@ -75,9 +69,9 @@ @ResponseBody public Object add(AppUserOpenid appUserOpenid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",appUserOpenid.getOpenid()); + ew.eq("openid", appUserOpenid.getOpenid()); // appUserOpenid.delete(ew); - if(ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))){ + if (ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))) { return ResponseData.success("已授权"); } appUserOpenidService.insert(appUserOpenid); @@ -116,8 +110,8 @@ @RequestMapping(value = "/login") @ResponseBody - public Object login(String appid, String secret,String code) { - String openid=""; + public Object login(String appid, String secret, String code) { + String openid = ""; StringBuilder url = new StringBuilder(wxUrl); url.append("?appid=");//appid设置 url.append(appid); @@ -134,7 +128,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json - openid =res.get("openid").toString(); + openid = res.get("openid").toString(); } catch (Exception e) { e.printStackTrace(); } @@ -150,8 +144,8 @@ // @BussinessLog(value = "登录日志", key = APPUSER_LOGIN_LOG_KEY, dict = AppUserOpenidDict.class) public Object validate(String openid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",openid); - AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); + ew.eq("openid", openid); + AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); return ResponseData.success(appUserOpenid); } } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index dc95f58..f37a3d9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -8,12 +8,10 @@ import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.app.dict.AppUserOpenidDict; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; - import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.HttpClientBuilder; @@ -24,16 +22,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - import javax.annotation.Resource; import java.util.List; import java.util.Map; -import static com.casic.missiles.modular.app.dict.AppUserOpenidDict.APPUSER_LOGIN_LOG_KEY; - /** - * - * * @author dev * @Date 2020-05-24 11:21:45 */ @@ -47,6 +40,7 @@ @Value("${casic.wxUrl}") private String wxUrl; + /** * 获取授权列表 */ @@ -75,9 +69,9 @@ @ResponseBody public Object add(AppUserOpenid appUserOpenid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",appUserOpenid.getOpenid()); + ew.eq("openid", appUserOpenid.getOpenid()); // appUserOpenid.delete(ew); - if(ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))){ + if (ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))) { return ResponseData.success("已授权"); } appUserOpenidService.insert(appUserOpenid); @@ -116,8 +110,8 @@ @RequestMapping(value = "/login") @ResponseBody - public Object login(String appid, String secret,String code) { - String openid=""; + public Object login(String appid, String secret, String code) { + String openid = ""; StringBuilder url = new StringBuilder(wxUrl); url.append("?appid=");//appid设置 url.append(appid); @@ -134,7 +128,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json - openid =res.get("openid").toString(); + openid = res.get("openid").toString(); } catch (Exception e) { e.printStackTrace(); } @@ -150,8 +144,8 @@ // @BussinessLog(value = "登录日志", key = APPUSER_LOGIN_LOG_KEY, dict = AppUserOpenidDict.class) public Object validate(String openid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",openid); - AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); + ew.eq("openid", openid); + AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); return ResponseData.success(appUserOpenid); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java index 5d75451..3bb29fc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java @@ -126,6 +126,9 @@ contract1.setContractAmount(contract.getContractAmount()); contract1.setContractContent(contract.getContractContent()); contract1.setContractFactory(contract.getContractFactory()); + contract1.setDeptid(contract.getDescription()); + contract1.setIsover(contract.getIsover()); + contract1.setDescription(contract.getDescription()); contract1.setPrincipal(contract.getPrincipal()); Account user = userService.findUserByName(contract.getPrincipal()); contract1.setDeptid(null != user && user.getId() != null ? user.getDeptid().toString() : ""); @@ -246,4 +249,19 @@ return ResponseData.success(200, "", contractList); } + /** + * 更新合同执行情况 + */ + @RequestMapping(value = "/updateContract") + @ResponseBody + public Object updateContract() { + EntityWrapper entityWrapper = new EntityWrapper<>(); + List contractList = contractService.selectList(entityWrapper); + for (Contract contract : contractList) { + contractService.updateContractStatus(contract.getId()); + } + return ResponseData.success(); + } + + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index dc95f58..f37a3d9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -8,12 +8,10 @@ import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.app.dict.AppUserOpenidDict; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; - import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.HttpClientBuilder; @@ -24,16 +22,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - import javax.annotation.Resource; import java.util.List; import java.util.Map; -import static com.casic.missiles.modular.app.dict.AppUserOpenidDict.APPUSER_LOGIN_LOG_KEY; - /** - * - * * @author dev * @Date 2020-05-24 11:21:45 */ @@ -47,6 +40,7 @@ @Value("${casic.wxUrl}") private String wxUrl; + /** * 获取授权列表 */ @@ -75,9 +69,9 @@ @ResponseBody public Object add(AppUserOpenid appUserOpenid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",appUserOpenid.getOpenid()); + ew.eq("openid", appUserOpenid.getOpenid()); // appUserOpenid.delete(ew); - if(ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))){ + if (ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))) { return ResponseData.success("已授权"); } appUserOpenidService.insert(appUserOpenid); @@ -116,8 +110,8 @@ @RequestMapping(value = "/login") @ResponseBody - public Object login(String appid, String secret,String code) { - String openid=""; + public Object login(String appid, String secret, String code) { + String openid = ""; StringBuilder url = new StringBuilder(wxUrl); url.append("?appid=");//appid设置 url.append(appid); @@ -134,7 +128,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json - openid =res.get("openid").toString(); + openid = res.get("openid").toString(); } catch (Exception e) { e.printStackTrace(); } @@ -150,8 +144,8 @@ // @BussinessLog(value = "登录日志", key = APPUSER_LOGIN_LOG_KEY, dict = AppUserOpenidDict.class) public Object validate(String openid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",openid); - AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); + ew.eq("openid", openid); + AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); return ResponseData.success(appUserOpenid); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java index 5d75451..3bb29fc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java @@ -126,6 +126,9 @@ contract1.setContractAmount(contract.getContractAmount()); contract1.setContractContent(contract.getContractContent()); contract1.setContractFactory(contract.getContractFactory()); + contract1.setDeptid(contract.getDescription()); + contract1.setIsover(contract.getIsover()); + contract1.setDescription(contract.getDescription()); contract1.setPrincipal(contract.getPrincipal()); Account user = userService.findUserByName(contract.getPrincipal()); contract1.setDeptid(null != user && user.getId() != null ? user.getDeptid().toString() : ""); @@ -246,4 +249,19 @@ return ResponseData.success(200, "", contractList); } + /** + * 更新合同执行情况 + */ + @RequestMapping(value = "/updateContract") + @ResponseBody + public Object updateContract() { + EntityWrapper entityWrapper = new EntityWrapper<>(); + List contractList = contractService.selectList(entityWrapper); + for (Contract contract : contractList) { + contractService.updateContractStatus(contract.getId()); + } + return ResponseData.success(); + } + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java index 98bd639..c32ee6b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java @@ -9,6 +9,7 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.Reimburse; +import com.casic.missiles.modular.system.service.IContractService; import com.casic.missiles.modular.system.service.IReimburseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -32,7 +33,8 @@ @Autowired private IReimburseService reimburseService; - + @Autowired + private IContractService contractService; /** * 获取列表 @@ -45,7 +47,8 @@ wrapper.orderBy("reorder"); List reimburseList = reimburseService.selectList(wrapper); reimburseList.forEach(reimburse -> { - reimburse.setPaytimeFmt(DateUtil.format(reimburse.getReimburseTime(), "yyyy-MM-dd HH:mm:ss")); + reimburse.setPaytimeFmt(ToolUtil.isNotEmpty(reimburse.getReimburseTime())? + DateUtil.format(reimburse.getReimburseTime(), "yyyy-MM-dd HH:mm:ss"):""); }); return ResponseData.success(reimburseList); } @@ -80,6 +83,8 @@ reimburse.setReimburseTime(ToolUtil.isNotEmpty(paytimeFmt) ? Timestamp.valueOf(paytimeFmt) : null); reimburseService.insert(reimburse); + //更新合同执行状态 + contractService.updateContractStatus(reimburse.getProId()); return ResponseData.success(); } @@ -117,6 +122,8 @@ reimburse.setReimburseTime(ToolUtil.isNotEmpty(paytimeFmt) ? Timestamp.valueOf(paytimeFmt) : null); reimburseService.updateById(reimburse); + //更新合同执行状态 + contractService.updateContractStatus(reimburse.getProId()); return ResponseData.success(); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index dc95f58..f37a3d9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -8,12 +8,10 @@ import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.app.dict.AppUserOpenidDict; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; - import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.HttpClientBuilder; @@ -24,16 +22,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - import javax.annotation.Resource; import java.util.List; import java.util.Map; -import static com.casic.missiles.modular.app.dict.AppUserOpenidDict.APPUSER_LOGIN_LOG_KEY; - /** - * - * * @author dev * @Date 2020-05-24 11:21:45 */ @@ -47,6 +40,7 @@ @Value("${casic.wxUrl}") private String wxUrl; + /** * 获取授权列表 */ @@ -75,9 +69,9 @@ @ResponseBody public Object add(AppUserOpenid appUserOpenid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",appUserOpenid.getOpenid()); + ew.eq("openid", appUserOpenid.getOpenid()); // appUserOpenid.delete(ew); - if(ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))){ + if (ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))) { return ResponseData.success("已授权"); } appUserOpenidService.insert(appUserOpenid); @@ -116,8 +110,8 @@ @RequestMapping(value = "/login") @ResponseBody - public Object login(String appid, String secret,String code) { - String openid=""; + public Object login(String appid, String secret, String code) { + String openid = ""; StringBuilder url = new StringBuilder(wxUrl); url.append("?appid=");//appid设置 url.append(appid); @@ -134,7 +128,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json - openid =res.get("openid").toString(); + openid = res.get("openid").toString(); } catch (Exception e) { e.printStackTrace(); } @@ -150,8 +144,8 @@ // @BussinessLog(value = "登录日志", key = APPUSER_LOGIN_LOG_KEY, dict = AppUserOpenidDict.class) public Object validate(String openid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",openid); - AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); + ew.eq("openid", openid); + AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); return ResponseData.success(appUserOpenid); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java index 5d75451..3bb29fc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java @@ -126,6 +126,9 @@ contract1.setContractAmount(contract.getContractAmount()); contract1.setContractContent(contract.getContractContent()); contract1.setContractFactory(contract.getContractFactory()); + contract1.setDeptid(contract.getDescription()); + contract1.setIsover(contract.getIsover()); + contract1.setDescription(contract.getDescription()); contract1.setPrincipal(contract.getPrincipal()); Account user = userService.findUserByName(contract.getPrincipal()); contract1.setDeptid(null != user && user.getId() != null ? user.getDeptid().toString() : ""); @@ -246,4 +249,19 @@ return ResponseData.success(200, "", contractList); } + /** + * 更新合同执行情况 + */ + @RequestMapping(value = "/updateContract") + @ResponseBody + public Object updateContract() { + EntityWrapper entityWrapper = new EntityWrapper<>(); + List contractList = contractService.selectList(entityWrapper); + for (Contract contract : contractList) { + contractService.updateContractStatus(contract.getId()); + } + return ResponseData.success(); + } + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java index 98bd639..c32ee6b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java @@ -9,6 +9,7 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.Reimburse; +import com.casic.missiles.modular.system.service.IContractService; import com.casic.missiles.modular.system.service.IReimburseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -32,7 +33,8 @@ @Autowired private IReimburseService reimburseService; - + @Autowired + private IContractService contractService; /** * 获取列表 @@ -45,7 +47,8 @@ wrapper.orderBy("reorder"); List reimburseList = reimburseService.selectList(wrapper); reimburseList.forEach(reimburse -> { - reimburse.setPaytimeFmt(DateUtil.format(reimburse.getReimburseTime(), "yyyy-MM-dd HH:mm:ss")); + reimburse.setPaytimeFmt(ToolUtil.isNotEmpty(reimburse.getReimburseTime())? + DateUtil.format(reimburse.getReimburseTime(), "yyyy-MM-dd HH:mm:ss"):""); }); return ResponseData.success(reimburseList); } @@ -80,6 +83,8 @@ reimburse.setReimburseTime(ToolUtil.isNotEmpty(paytimeFmt) ? Timestamp.valueOf(paytimeFmt) : null); reimburseService.insert(reimburse); + //更新合同执行状态 + contractService.updateContractStatus(reimburse.getProId()); return ResponseData.success(); } @@ -117,6 +122,8 @@ reimburse.setReimburseTime(ToolUtil.isNotEmpty(paytimeFmt) ? Timestamp.valueOf(paytimeFmt) : null); reimburseService.updateById(reimburse); + //更新合同执行状态 + contractService.updateContractStatus(reimburse.getProId()); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml index ef58eb2..2a1d82c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml @@ -18,7 +18,7 @@ - contract_number AS contractNumber, contract_name AS contractName, contract_content AS contractContent, contract_amount AS contractAmount, contract_factory AS contractFactory, external_project_apply AS externalProjectApply, external_contract_apply AS externalContractApply, external_check_apply AS externalCheckApply,principal, id,deptid + contract_number AS contractNumber, contract_name AS contractName, contract_content AS contractContent, contract_amount AS contractAmount, contract_factory AS contractFactory, external_project_apply AS externalProjectApply, external_contract_apply AS externalContractApply, external_check_apply AS externalCheckApply,principal, id,deptid,isover diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index dc95f58..f37a3d9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -8,12 +8,10 @@ import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.app.dict.AppUserOpenidDict; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; - import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.HttpClientBuilder; @@ -24,16 +22,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - import javax.annotation.Resource; import java.util.List; import java.util.Map; -import static com.casic.missiles.modular.app.dict.AppUserOpenidDict.APPUSER_LOGIN_LOG_KEY; - /** - * - * * @author dev * @Date 2020-05-24 11:21:45 */ @@ -47,6 +40,7 @@ @Value("${casic.wxUrl}") private String wxUrl; + /** * 获取授权列表 */ @@ -75,9 +69,9 @@ @ResponseBody public Object add(AppUserOpenid appUserOpenid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",appUserOpenid.getOpenid()); + ew.eq("openid", appUserOpenid.getOpenid()); // appUserOpenid.delete(ew); - if(ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))){ + if (ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))) { return ResponseData.success("已授权"); } appUserOpenidService.insert(appUserOpenid); @@ -116,8 +110,8 @@ @RequestMapping(value = "/login") @ResponseBody - public Object login(String appid, String secret,String code) { - String openid=""; + public Object login(String appid, String secret, String code) { + String openid = ""; StringBuilder url = new StringBuilder(wxUrl); url.append("?appid=");//appid设置 url.append(appid); @@ -134,7 +128,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json - openid =res.get("openid").toString(); + openid = res.get("openid").toString(); } catch (Exception e) { e.printStackTrace(); } @@ -150,8 +144,8 @@ // @BussinessLog(value = "登录日志", key = APPUSER_LOGIN_LOG_KEY, dict = AppUserOpenidDict.class) public Object validate(String openid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",openid); - AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); + ew.eq("openid", openid); + AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); return ResponseData.success(appUserOpenid); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java index 5d75451..3bb29fc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java @@ -126,6 +126,9 @@ contract1.setContractAmount(contract.getContractAmount()); contract1.setContractContent(contract.getContractContent()); contract1.setContractFactory(contract.getContractFactory()); + contract1.setDeptid(contract.getDescription()); + contract1.setIsover(contract.getIsover()); + contract1.setDescription(contract.getDescription()); contract1.setPrincipal(contract.getPrincipal()); Account user = userService.findUserByName(contract.getPrincipal()); contract1.setDeptid(null != user && user.getId() != null ? user.getDeptid().toString() : ""); @@ -246,4 +249,19 @@ return ResponseData.success(200, "", contractList); } + /** + * 更新合同执行情况 + */ + @RequestMapping(value = "/updateContract") + @ResponseBody + public Object updateContract() { + EntityWrapper entityWrapper = new EntityWrapper<>(); + List contractList = contractService.selectList(entityWrapper); + for (Contract contract : contractList) { + contractService.updateContractStatus(contract.getId()); + } + return ResponseData.success(); + } + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java index 98bd639..c32ee6b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java @@ -9,6 +9,7 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.Reimburse; +import com.casic.missiles.modular.system.service.IContractService; import com.casic.missiles.modular.system.service.IReimburseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -32,7 +33,8 @@ @Autowired private IReimburseService reimburseService; - + @Autowired + private IContractService contractService; /** * 获取列表 @@ -45,7 +47,8 @@ wrapper.orderBy("reorder"); List reimburseList = reimburseService.selectList(wrapper); reimburseList.forEach(reimburse -> { - reimburse.setPaytimeFmt(DateUtil.format(reimburse.getReimburseTime(), "yyyy-MM-dd HH:mm:ss")); + reimburse.setPaytimeFmt(ToolUtil.isNotEmpty(reimburse.getReimburseTime())? + DateUtil.format(reimburse.getReimburseTime(), "yyyy-MM-dd HH:mm:ss"):""); }); return ResponseData.success(reimburseList); } @@ -80,6 +83,8 @@ reimburse.setReimburseTime(ToolUtil.isNotEmpty(paytimeFmt) ? Timestamp.valueOf(paytimeFmt) : null); reimburseService.insert(reimburse); + //更新合同执行状态 + contractService.updateContractStatus(reimburse.getProId()); return ResponseData.success(); } @@ -117,6 +122,8 @@ reimburse.setReimburseTime(ToolUtil.isNotEmpty(paytimeFmt) ? Timestamp.valueOf(paytimeFmt) : null); reimburseService.updateById(reimburse); + //更新合同执行状态 + contractService.updateContractStatus(reimburse.getProId()); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml index ef58eb2..2a1d82c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml @@ -18,7 +18,7 @@ - contract_number AS contractNumber, contract_name AS contractName, contract_content AS contractContent, contract_amount AS contractAmount, contract_factory AS contractFactory, external_project_apply AS externalProjectApply, external_contract_apply AS externalContractApply, external_check_apply AS externalCheckApply,principal, id,deptid + contract_number AS contractNumber, contract_name AS contractName, contract_content AS contractContent, contract_amount AS contractAmount, contract_factory AS contractFactory, external_project_apply AS externalProjectApply, external_contract_apply AS externalContractApply, external_check_apply AS externalCheckApply,principal, id,deptid,isover diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java index 8663e63..de0136c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java @@ -53,6 +53,8 @@ @TableField("deptid") private String deptid; private String isstored; + private String isover; + private String description; public String getContractNumber() { return contractNumber; @@ -174,6 +176,22 @@ this.isstored = isstored; } + public String getIsover() { + return isover; + } + + public void setIsover(String isover) { + this.isover = isover; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index dc95f58..f37a3d9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -8,12 +8,10 @@ import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.app.dict.AppUserOpenidDict; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; - import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.HttpClientBuilder; @@ -24,16 +22,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - import javax.annotation.Resource; import java.util.List; import java.util.Map; -import static com.casic.missiles.modular.app.dict.AppUserOpenidDict.APPUSER_LOGIN_LOG_KEY; - /** - * - * * @author dev * @Date 2020-05-24 11:21:45 */ @@ -47,6 +40,7 @@ @Value("${casic.wxUrl}") private String wxUrl; + /** * 获取授权列表 */ @@ -75,9 +69,9 @@ @ResponseBody public Object add(AppUserOpenid appUserOpenid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",appUserOpenid.getOpenid()); + ew.eq("openid", appUserOpenid.getOpenid()); // appUserOpenid.delete(ew); - if(ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))){ + if (ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))) { return ResponseData.success("已授权"); } appUserOpenidService.insert(appUserOpenid); @@ -116,8 +110,8 @@ @RequestMapping(value = "/login") @ResponseBody - public Object login(String appid, String secret,String code) { - String openid=""; + public Object login(String appid, String secret, String code) { + String openid = ""; StringBuilder url = new StringBuilder(wxUrl); url.append("?appid=");//appid设置 url.append(appid); @@ -134,7 +128,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json - openid =res.get("openid").toString(); + openid = res.get("openid").toString(); } catch (Exception e) { e.printStackTrace(); } @@ -150,8 +144,8 @@ // @BussinessLog(value = "登录日志", key = APPUSER_LOGIN_LOG_KEY, dict = AppUserOpenidDict.class) public Object validate(String openid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",openid); - AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); + ew.eq("openid", openid); + AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); return ResponseData.success(appUserOpenid); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java index 5d75451..3bb29fc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java @@ -126,6 +126,9 @@ contract1.setContractAmount(contract.getContractAmount()); contract1.setContractContent(contract.getContractContent()); contract1.setContractFactory(contract.getContractFactory()); + contract1.setDeptid(contract.getDescription()); + contract1.setIsover(contract.getIsover()); + contract1.setDescription(contract.getDescription()); contract1.setPrincipal(contract.getPrincipal()); Account user = userService.findUserByName(contract.getPrincipal()); contract1.setDeptid(null != user && user.getId() != null ? user.getDeptid().toString() : ""); @@ -246,4 +249,19 @@ return ResponseData.success(200, "", contractList); } + /** + * 更新合同执行情况 + */ + @RequestMapping(value = "/updateContract") + @ResponseBody + public Object updateContract() { + EntityWrapper entityWrapper = new EntityWrapper<>(); + List contractList = contractService.selectList(entityWrapper); + for (Contract contract : contractList) { + contractService.updateContractStatus(contract.getId()); + } + return ResponseData.success(); + } + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java index 98bd639..c32ee6b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java @@ -9,6 +9,7 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.Reimburse; +import com.casic.missiles.modular.system.service.IContractService; import com.casic.missiles.modular.system.service.IReimburseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -32,7 +33,8 @@ @Autowired private IReimburseService reimburseService; - + @Autowired + private IContractService contractService; /** * 获取列表 @@ -45,7 +47,8 @@ wrapper.orderBy("reorder"); List reimburseList = reimburseService.selectList(wrapper); reimburseList.forEach(reimburse -> { - reimburse.setPaytimeFmt(DateUtil.format(reimburse.getReimburseTime(), "yyyy-MM-dd HH:mm:ss")); + reimburse.setPaytimeFmt(ToolUtil.isNotEmpty(reimburse.getReimburseTime())? + DateUtil.format(reimburse.getReimburseTime(), "yyyy-MM-dd HH:mm:ss"):""); }); return ResponseData.success(reimburseList); } @@ -80,6 +83,8 @@ reimburse.setReimburseTime(ToolUtil.isNotEmpty(paytimeFmt) ? Timestamp.valueOf(paytimeFmt) : null); reimburseService.insert(reimburse); + //更新合同执行状态 + contractService.updateContractStatus(reimburse.getProId()); return ResponseData.success(); } @@ -117,6 +122,8 @@ reimburse.setReimburseTime(ToolUtil.isNotEmpty(paytimeFmt) ? Timestamp.valueOf(paytimeFmt) : null); reimburseService.updateById(reimburse); + //更新合同执行状态 + contractService.updateContractStatus(reimburse.getProId()); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml index ef58eb2..2a1d82c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml @@ -18,7 +18,7 @@ - contract_number AS contractNumber, contract_name AS contractName, contract_content AS contractContent, contract_amount AS contractAmount, contract_factory AS contractFactory, external_project_apply AS externalProjectApply, external_contract_apply AS externalContractApply, external_check_apply AS externalCheckApply,principal, id,deptid + contract_number AS contractNumber, contract_name AS contractName, contract_content AS contractContent, contract_amount AS contractAmount, contract_factory AS contractFactory, external_project_apply AS externalProjectApply, external_contract_apply AS externalContractApply, external_check_apply AS externalCheckApply,principal, id,deptid,isover diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java index 8663e63..de0136c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java @@ -53,6 +53,8 @@ @TableField("deptid") private String deptid; private String isstored; + private String isover; + private String description; public String getContractNumber() { return contractNumber; @@ -174,6 +176,22 @@ this.isstored = isstored; } + public String getIsover() { + return isover; + } + + public void setIsover(String isover) { + this.isover = isover; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IContractService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IContractService.java index d8b5e87..2a86d0c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IContractService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IContractService.java @@ -18,4 +18,5 @@ List selectPageList(Page page, String keyword1, String keyword2, String keyword3); List reportExport(String keyword1, String keyword2, String keyword3); void importContract( List contracts); + void updateContractStatus(Long conId); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index dc95f58..f37a3d9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -8,12 +8,10 @@ import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.app.dict.AppUserOpenidDict; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; - import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.HttpClientBuilder; @@ -24,16 +22,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - import javax.annotation.Resource; import java.util.List; import java.util.Map; -import static com.casic.missiles.modular.app.dict.AppUserOpenidDict.APPUSER_LOGIN_LOG_KEY; - /** - * - * * @author dev * @Date 2020-05-24 11:21:45 */ @@ -47,6 +40,7 @@ @Value("${casic.wxUrl}") private String wxUrl; + /** * 获取授权列表 */ @@ -75,9 +69,9 @@ @ResponseBody public Object add(AppUserOpenid appUserOpenid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",appUserOpenid.getOpenid()); + ew.eq("openid", appUserOpenid.getOpenid()); // appUserOpenid.delete(ew); - if(ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))){ + if (ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))) { return ResponseData.success("已授权"); } appUserOpenidService.insert(appUserOpenid); @@ -116,8 +110,8 @@ @RequestMapping(value = "/login") @ResponseBody - public Object login(String appid, String secret,String code) { - String openid=""; + public Object login(String appid, String secret, String code) { + String openid = ""; StringBuilder url = new StringBuilder(wxUrl); url.append("?appid=");//appid设置 url.append(appid); @@ -134,7 +128,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json - openid =res.get("openid").toString(); + openid = res.get("openid").toString(); } catch (Exception e) { e.printStackTrace(); } @@ -150,8 +144,8 @@ // @BussinessLog(value = "登录日志", key = APPUSER_LOGIN_LOG_KEY, dict = AppUserOpenidDict.class) public Object validate(String openid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",openid); - AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); + ew.eq("openid", openid); + AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); return ResponseData.success(appUserOpenid); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java index 5d75451..3bb29fc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java @@ -126,6 +126,9 @@ contract1.setContractAmount(contract.getContractAmount()); contract1.setContractContent(contract.getContractContent()); contract1.setContractFactory(contract.getContractFactory()); + contract1.setDeptid(contract.getDescription()); + contract1.setIsover(contract.getIsover()); + contract1.setDescription(contract.getDescription()); contract1.setPrincipal(contract.getPrincipal()); Account user = userService.findUserByName(contract.getPrincipal()); contract1.setDeptid(null != user && user.getId() != null ? user.getDeptid().toString() : ""); @@ -246,4 +249,19 @@ return ResponseData.success(200, "", contractList); } + /** + * 更新合同执行情况 + */ + @RequestMapping(value = "/updateContract") + @ResponseBody + public Object updateContract() { + EntityWrapper entityWrapper = new EntityWrapper<>(); + List contractList = contractService.selectList(entityWrapper); + for (Contract contract : contractList) { + contractService.updateContractStatus(contract.getId()); + } + return ResponseData.success(); + } + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java index 98bd639..c32ee6b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java @@ -9,6 +9,7 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.Reimburse; +import com.casic.missiles.modular.system.service.IContractService; import com.casic.missiles.modular.system.service.IReimburseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -32,7 +33,8 @@ @Autowired private IReimburseService reimburseService; - + @Autowired + private IContractService contractService; /** * 获取列表 @@ -45,7 +47,8 @@ wrapper.orderBy("reorder"); List reimburseList = reimburseService.selectList(wrapper); reimburseList.forEach(reimburse -> { - reimburse.setPaytimeFmt(DateUtil.format(reimburse.getReimburseTime(), "yyyy-MM-dd HH:mm:ss")); + reimburse.setPaytimeFmt(ToolUtil.isNotEmpty(reimburse.getReimburseTime())? + DateUtil.format(reimburse.getReimburseTime(), "yyyy-MM-dd HH:mm:ss"):""); }); return ResponseData.success(reimburseList); } @@ -80,6 +83,8 @@ reimburse.setReimburseTime(ToolUtil.isNotEmpty(paytimeFmt) ? Timestamp.valueOf(paytimeFmt) : null); reimburseService.insert(reimburse); + //更新合同执行状态 + contractService.updateContractStatus(reimburse.getProId()); return ResponseData.success(); } @@ -117,6 +122,8 @@ reimburse.setReimburseTime(ToolUtil.isNotEmpty(paytimeFmt) ? Timestamp.valueOf(paytimeFmt) : null); reimburseService.updateById(reimburse); + //更新合同执行状态 + contractService.updateContractStatus(reimburse.getProId()); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml index ef58eb2..2a1d82c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml @@ -18,7 +18,7 @@ - contract_number AS contractNumber, contract_name AS contractName, contract_content AS contractContent, contract_amount AS contractAmount, contract_factory AS contractFactory, external_project_apply AS externalProjectApply, external_contract_apply AS externalContractApply, external_check_apply AS externalCheckApply,principal, id,deptid + contract_number AS contractNumber, contract_name AS contractName, contract_content AS contractContent, contract_amount AS contractAmount, contract_factory AS contractFactory, external_project_apply AS externalProjectApply, external_contract_apply AS externalContractApply, external_check_apply AS externalCheckApply,principal, id,deptid,isover diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java index 8663e63..de0136c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java @@ -53,6 +53,8 @@ @TableField("deptid") private String deptid; private String isstored; + private String isover; + private String description; public String getContractNumber() { return contractNumber; @@ -174,6 +176,22 @@ this.isstored = isstored; } + public String getIsover() { + return isover; + } + + public void setIsover(String isover) { + this.isover = isover; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IContractService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IContractService.java index d8b5e87..2a86d0c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IContractService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IContractService.java @@ -18,4 +18,5 @@ List selectPageList(Page page, String keyword1, String keyword2, String keyword3); List reportExport(String keyword1, String keyword2, String keyword3); void importContract( List contracts); + void updateContractStatus(Long conId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java index 8b8d7d8..77517e3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java @@ -11,9 +11,11 @@ import com.casic.missiles.modular.system.model.Contract; import com.casic.missiles.modular.system.model.Payments; import com.casic.missiles.modular.system.model.Account; +import com.casic.missiles.modular.system.model.Reimburse; import com.casic.missiles.modular.system.service.IContractService; import com.casic.missiles.modular.system.service.IPaymentsService; import com.casic.missiles.modular.system.service.IAccountService; +import com.casic.missiles.modular.system.service.IReimburseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -38,6 +40,8 @@ @Autowired private IPaymentsService paymentsService; @Autowired + private IReimburseService reimburseService; + @Autowired private ICommonPermissionService permissionService; @Autowired private IAccountService userService; @@ -72,9 +76,9 @@ DataScope dataScope = permissionService.getCurrUserDataScope(); ShiroUser currentUser = permissionService.getCurrLoginUser(); if (currentUser.getRoleTips().contains(producerName) || currentUser.getRoleTips().contains(repairName)) { - contractList = this.baseMapper.findContractList(dataScope,page, currentUser.getName(), keyword1, keyword2, keyword3); + contractList = this.baseMapper.findContractList(dataScope, page, currentUser.getName(), keyword1, keyword2, keyword3); } else { - contractList = this.baseMapper.findContractList(dataScope,page, "", keyword1, keyword2, keyword3); + contractList = this.baseMapper.findContractList(dataScope, page, "", keyword1, keyword2, keyword3); } contractList.forEach(contract -> { contract.setPaymentStatus(getPaymentStatus(contract)); @@ -82,6 +86,7 @@ + "外协合同申请：" + permissionService.getDictNameByCode("applyStatus", contract.getExternalContractApply()) + "\n" + "外协验收申请：" + permissionService.getDictNameByCode("applyStatus", contract.getExternalCheckApply()); contract.setNetFlow(netFlowStr); + contract.setIsover(permissionService.getDictNameByCode("isover", contract.getIsover())); }); return contractList; @@ -103,7 +108,7 @@ List contractList = this.selectList(query); contractList.forEach(contract -> { contract.setPaymentStatus(getPaymentStatus(contract)); -// permissionService.findInDictByCode("applyStatus") + contract.setIsover(permissionService.getDictNameByCode("isover", contract.getIsover())); String netFlowStr = "外协项目申请：" + permissionService.getDictNameByCode("applyStatus", contract.getExternalProjectApply()) + "\n" + "外协合同申请：" + permissionService.getDictNameByCode("applyStatus", contract.getExternalContractApply()) + "\n" + "外协验收申请：" + permissionService.getDictNameByCode("applyStatus", contract.getExternalCheckApply()); @@ -126,21 +131,46 @@ } public String getPaymentStatus(Contract contract) { - if(ToolUtil.isEmpty(contract.getContractAmount())||"0".equals(contract.getContractAmount())){ + if (ToolUtil.isEmpty(contract.getContractAmount()) || "0".equals(contract.getContractAmount())) { return "0,0%"; } Map paraMap = new HashMap<>(); paraMap.put("pro_id", contract.getId()); List paymentsList = paymentsService.selectByMap(paraMap); // double sum = 0; - BigDecimal sum= new BigDecimal(0); + BigDecimal sum = new BigDecimal(0); for (Payments payments : paymentsList) { - if(ToolUtil.isNotEmpty(payments.getMoney())){ - sum=sum.add(new BigDecimal(payments.getMoney())); + if (ToolUtil.isNotEmpty(payments.getMoney())) { + sum = sum.add(new BigDecimal(payments.getMoney())); } // sum = sum + (ToolUtil.isNotEmpty(payments.getMoney()) ? Float.parseFloat(payments.getMoney()) : 0); } DecimalFormat df = new DecimalFormat("#.##%"); return sum.doubleValue() + "," + df.format(sum.doubleValue() / Double.valueOf(contract.getContractAmount())); } + + @Override + public void updateContractStatus(Long conId) { + Contract contract = this.selectById(conId); + if (null != contract) { + if (this.reimburses(conId).equals(contract.getContractAmount())) { + contract.setIsover("1"); + this.updateById(contract); + } + } + } + + public String reimburses(Long conId) { + EntityWrapper entityWrapper = new EntityWrapper<>(); + entityWrapper.eq("pro_id", conId); + List reimburseList = reimburseService.selectList(entityWrapper); + BigDecimal b1 = new BigDecimal(0); + for (Reimburse reimburse : reimburseList) { + if (ToolUtil.isNotEmpty(reimburse.getMoney())) { + b1 = b1.add(new BigDecimal(reimburse.getMoney())); + } + } + return b1.toString(); + } + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index dc95f58..f37a3d9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -8,12 +8,10 @@ import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.app.dict.AppUserOpenidDict; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; - import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.HttpClientBuilder; @@ -24,16 +22,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - import javax.annotation.Resource; import java.util.List; import java.util.Map; -import static com.casic.missiles.modular.app.dict.AppUserOpenidDict.APPUSER_LOGIN_LOG_KEY; - /** - * - * * @author dev * @Date 2020-05-24 11:21:45 */ @@ -47,6 +40,7 @@ @Value("${casic.wxUrl}") private String wxUrl; + /** * 获取授权列表 */ @@ -75,9 +69,9 @@ @ResponseBody public Object add(AppUserOpenid appUserOpenid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",appUserOpenid.getOpenid()); + ew.eq("openid", appUserOpenid.getOpenid()); // appUserOpenid.delete(ew); - if(ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))){ + if (ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))) { return ResponseData.success("已授权"); } appUserOpenidService.insert(appUserOpenid); @@ -116,8 +110,8 @@ @RequestMapping(value = "/login") @ResponseBody - public Object login(String appid, String secret,String code) { - String openid=""; + public Object login(String appid, String secret, String code) { + String openid = ""; StringBuilder url = new StringBuilder(wxUrl); url.append("?appid=");//appid设置 url.append(appid); @@ -134,7 +128,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json - openid =res.get("openid").toString(); + openid = res.get("openid").toString(); } catch (Exception e) { e.printStackTrace(); } @@ -150,8 +144,8 @@ // @BussinessLog(value = "登录日志", key = APPUSER_LOGIN_LOG_KEY, dict = AppUserOpenidDict.class) public Object validate(String openid) { EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid",openid); - AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); + ew.eq("openid", openid); + AppUserOpenid appUserOpenid = appUserOpenidService.selectOne(ew); return ResponseData.success(appUserOpenid); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java index 5d75451..3bb29fc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java @@ -126,6 +126,9 @@ contract1.setContractAmount(contract.getContractAmount()); contract1.setContractContent(contract.getContractContent()); contract1.setContractFactory(contract.getContractFactory()); + contract1.setDeptid(contract.getDescription()); + contract1.setIsover(contract.getIsover()); + contract1.setDescription(contract.getDescription()); contract1.setPrincipal(contract.getPrincipal()); Account user = userService.findUserByName(contract.getPrincipal()); contract1.setDeptid(null != user && user.getId() != null ? user.getDeptid().toString() : ""); @@ -246,4 +249,19 @@ return ResponseData.success(200, "", contractList); } + /** + * 更新合同执行情况 + */ + @RequestMapping(value = "/updateContract") + @ResponseBody + public Object updateContract() { + EntityWrapper entityWrapper = new EntityWrapper<>(); + List contractList = contractService.selectList(entityWrapper); + for (Contract contract : contractList) { + contractService.updateContractStatus(contract.getId()); + } + return ResponseData.success(); + } + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java index 98bd639..c32ee6b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ReimburseController.java @@ -9,6 +9,7 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.Reimburse; +import com.casic.missiles.modular.system.service.IContractService; import com.casic.missiles.modular.system.service.IReimburseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -32,7 +33,8 @@ @Autowired private IReimburseService reimburseService; - + @Autowired + private IContractService contractService; /** * 获取列表 @@ -45,7 +47,8 @@ wrapper.orderBy("reorder"); List reimburseList = reimburseService.selectList(wrapper); reimburseList.forEach(reimburse -> { - reimburse.setPaytimeFmt(DateUtil.format(reimburse.getReimburseTime(), "yyyy-MM-dd HH:mm:ss")); + reimburse.setPaytimeFmt(ToolUtil.isNotEmpty(reimburse.getReimburseTime())? + DateUtil.format(reimburse.getReimburseTime(), "yyyy-MM-dd HH:mm:ss"):""); }); return ResponseData.success(reimburseList); } @@ -80,6 +83,8 @@ reimburse.setReimburseTime(ToolUtil.isNotEmpty(paytimeFmt) ? Timestamp.valueOf(paytimeFmt) : null); reimburseService.insert(reimburse); + //更新合同执行状态 + contractService.updateContractStatus(reimburse.getProId()); return ResponseData.success(); } @@ -117,6 +122,8 @@ reimburse.setReimburseTime(ToolUtil.isNotEmpty(paytimeFmt) ? Timestamp.valueOf(paytimeFmt) : null); reimburseService.updateById(reimburse); + //更新合同执行状态 + contractService.updateContractStatus(reimburse.getProId()); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml index ef58eb2..2a1d82c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ContractMapper.xml @@ -18,7 +18,7 @@ - contract_number AS contractNumber, contract_name AS contractName, contract_content AS contractContent, contract_amount AS contractAmount, contract_factory AS contractFactory, external_project_apply AS externalProjectApply, external_contract_apply AS externalContractApply, external_check_apply AS externalCheckApply,principal, id,deptid + contract_number AS contractNumber, contract_name AS contractName, contract_content AS contractContent, contract_amount AS contractAmount, contract_factory AS contractFactory, external_project_apply AS externalProjectApply, external_contract_apply AS externalContractApply, external_check_apply AS externalCheckApply,principal, id,deptid,isover diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java index 8663e63..de0136c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Contract.java @@ -53,6 +53,8 @@ @TableField("deptid") private String deptid; private String isstored; + private String isover; + private String description; public String getContractNumber() { return contractNumber; @@ -174,6 +176,22 @@ this.isstored = isstored; } + public String getIsover() { + return isover; + } + + public void setIsover(String isover) { + this.isover = isover; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IContractService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IContractService.java index d8b5e87..2a86d0c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IContractService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IContractService.java @@ -18,4 +18,5 @@ List selectPageList(Page page, String keyword1, String keyword2, String keyword3); List reportExport(String keyword1, String keyword2, String keyword3); void importContract( List contracts); + void updateContractStatus(Long conId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java index 8b8d7d8..77517e3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java @@ -11,9 +11,11 @@ import com.casic.missiles.modular.system.model.Contract; import com.casic.missiles.modular.system.model.Payments; import com.casic.missiles.modular.system.model.Account; +import com.casic.missiles.modular.system.model.Reimburse; import com.casic.missiles.modular.system.service.IContractService; import com.casic.missiles.modular.system.service.IPaymentsService; import com.casic.missiles.modular.system.service.IAccountService; +import com.casic.missiles.modular.system.service.IReimburseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -38,6 +40,8 @@ @Autowired private IPaymentsService paymentsService; @Autowired + private IReimburseService reimburseService; + @Autowired private ICommonPermissionService permissionService; @Autowired private IAccountService userService; @@ -72,9 +76,9 @@ DataScope dataScope = permissionService.getCurrUserDataScope(); ShiroUser currentUser = permissionService.getCurrLoginUser(); if (currentUser.getRoleTips().contains(producerName) || currentUser.getRoleTips().contains(repairName)) { - contractList = this.baseMapper.findContractList(dataScope,page, currentUser.getName(), keyword1, keyword2, keyword3); + contractList = this.baseMapper.findContractList(dataScope, page, currentUser.getName(), keyword1, keyword2, keyword3); } else { - contractList = this.baseMapper.findContractList(dataScope,page, "", keyword1, keyword2, keyword3); + contractList = this.baseMapper.findContractList(dataScope, page, "", keyword1, keyword2, keyword3); } contractList.forEach(contract -> { contract.setPaymentStatus(getPaymentStatus(contract)); @@ -82,6 +86,7 @@ + "外协合同申请：" + permissionService.getDictNameByCode("applyStatus", contract.getExternalContractApply()) + "\n" + "外协验收申请：" + permissionService.getDictNameByCode("applyStatus", contract.getExternalCheckApply()); contract.setNetFlow(netFlowStr); + contract.setIsover(permissionService.getDictNameByCode("isover", contract.getIsover())); }); return contractList; @@ -103,7 +108,7 @@ List contractList = this.selectList(query); contractList.forEach(contract -> { contract.setPaymentStatus(getPaymentStatus(contract)); -// permissionService.findInDictByCode("applyStatus") + contract.setIsover(permissionService.getDictNameByCode("isover", contract.getIsover())); String netFlowStr = "外协项目申请：" + permissionService.getDictNameByCode("applyStatus", contract.getExternalProjectApply()) + "\n" + "外协合同申请：" + permissionService.getDictNameByCode("applyStatus", contract.getExternalContractApply()) + "\n" + "外协验收申请：" + permissionService.getDictNameByCode("applyStatus", contract.getExternalCheckApply()); @@ -126,21 +131,46 @@ } public String getPaymentStatus(Contract contract) { - if(ToolUtil.isEmpty(contract.getContractAmount())||"0".equals(contract.getContractAmount())){ + if (ToolUtil.isEmpty(contract.getContractAmount()) || "0".equals(contract.getContractAmount())) { return "0,0%"; } Map paraMap = new HashMap<>(); paraMap.put("pro_id", contract.getId()); List paymentsList = paymentsService.selectByMap(paraMap); // double sum = 0; - BigDecimal sum= new BigDecimal(0); + BigDecimal sum = new BigDecimal(0); for (Payments payments : paymentsList) { - if(ToolUtil.isNotEmpty(payments.getMoney())){ - sum=sum.add(new BigDecimal(payments.getMoney())); + if (ToolUtil.isNotEmpty(payments.getMoney())) { + sum = sum.add(new BigDecimal(payments.getMoney())); } // sum = sum + (ToolUtil.isNotEmpty(payments.getMoney()) ? Float.parseFloat(payments.getMoney()) : 0); } DecimalFormat df = new DecimalFormat("#.##%"); return sum.doubleValue() + "," + df.format(sum.doubleValue() / Double.valueOf(contract.getContractAmount())); } + + @Override + public void updateContractStatus(Long conId) { + Contract contract = this.selectById(conId); + if (null != contract) { + if (this.reimburses(conId).equals(contract.getContractAmount())) { + contract.setIsover("1"); + this.updateById(contract); + } + } + } + + public String reimburses(Long conId) { + EntityWrapper entityWrapper = new EntityWrapper<>(); + entityWrapper.eq("pro_id", conId); + List reimburseList = reimburseService.selectList(entityWrapper); + BigDecimal b1 = new BigDecimal(0); + for (Reimburse reimburse : reimburseList) { + if (ToolUtil.isNotEmpty(reimburse.getMoney())) { + b1 = b1.add(new BigDecimal(reimburse.getMoney())); + } + } + return b1.toString(); + } + } diff --git a/casic-web/src/main/resources/excel/repairsList.xlsx b/casic-web/src/main/resources/excel/repairsList.xlsx index 7c6edf1..3d5da1f 100644 --- a/casic-web/src/main/resources/excel/repairsList.xlsx +++ b/casic-web/src/main/resources/excel/repairsList.xlsx Binary files differ