77

science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java

@@ -230,6 +230,10 @@ public class ComProjectDTO extends BaseDTO {
     @ApiModelProperty(value = "结束", position = 3)
     private String endDateStr;
 
+    /** 姓名 */
+    @ApiModelProperty(value = "姓名", position = 41)
+    private String appUnitName;
+
     /** 姓名 */
     @ApiModelProperty(value = "姓名", position = 41)
     private String appPersonName;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

@@ -254,28 +254,28 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         //申报单位
         ComUnitDTO comUnitDTO = comUnitService.getUnitById(SecurityUserHolder.getUnitId());
         if (null != comUnitDTO) {
-            dto.setAppUnitName(comUnitDTO.getUnitName());
+//            dto.setAppUnitName(comUnitDTO.getUnitName());
             dto.setUnitTypeName(comUnitDTO.getUnitTypeName());
-            dto.setAddress(comUnitDTO.getUnitAddress());
-
-            dto.setOrganizationCode(comUnitDTO.getOrganizationCode());
-            dto.setRegisteredAddress(comUnitDTO.getRegisteredAddress());
-            dto.setPostCode(comUnitDTO.getPostCode());
+//            dto.setAddress(comUnitDTO.getUnitAddress());
+//
+//            dto.setOrganizationCode(comUnitDTO.getOrganizationCode());
+//            dto.setRegisteredAddress(comUnitDTO.getRegisteredAddress());
+//            dto.setPostCode(comUnitDTO.getPostCode());
 
             dto.setUnitLinkName(comUnitDTO.getLinkName());
             dto.setUnitLinkMobile(comUnitDTO.getTelephone());
             dto.setUnitLinkEmail(comUnitDTO.getEmail());
             dto.setUnitLinkFax(comUnitDTO.getFax());
 
-            dto.setLegalPerson(comUnitDTO.getLegalPerson());
-            dto.setWorkforce(comUnitDTO.getWorkforce());
-            dto.setSpecializedPersonnel(comUnitDTO.getSpecializedPersonnel());
-            dto.setResearchPersonnel(comUnitDTO.getResearchPersonnel());
-
-            dto.setDepositBank(comUnitDTO.getDepositBank());
-            dto.setBankAccount(comUnitDTO.getBankAccount());
-            dto.setDepositBankAddress(comUnitDTO.getDepositBankAddress());
-            dto.setInterbankNumber(comUnitDTO.getInterbankNumber());
+//            dto.setLegalPerson(comUnitDTO.getLegalPerson());
+//            dto.setWorkforce(comUnitDTO.getWorkforce());
+//            dto.setSpecializedPersonnel(comUnitDTO.getSpecializedPersonnel());
+//            dto.setResearchPersonnel(comUnitDTO.getResearchPersonnel());
+//
+//            dto.setDepositBank(comUnitDTO.getDepositBank());
+//            dto.setBankAccount(comUnitDTO.getBankAccount());
+//            dto.setDepositBankAddress(comUnitDTO.getDepositBankAddress());
+//            dto.setInterbankNumber(comUnitDTO.getInterbankNumber());
 
         }
 
@@ -331,7 +331,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         //申报单位
         ComUnitDTO comUnitDTO = comUnitService.getUnitById(dto.getAppUnitId());
         if (null != comUnitDTO) {
-            dto.setAppUnitName(comUnitDTO.getUnitName());
+//          dto.setAppUnitName(comUnitDTO.getUnitName());
             dto.setUnitTypeName(comUnitDTO.getUnitTypeName());
         }
 
@@ -554,7 +554,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         dto.setTitleName(comPersonDTO.getTitleName());
         dto.setDutyName(comPersonDTO.getDuty());
         dto.setSpecName(comPersonDTO.getSpecName());
-        dto.setAddress(comPersonDTO.getAddress());
         dto.setMobile(comPersonDTO.getMobile());
         dto.setEmail(comPersonDTO.getEmail());
     }
@@ -839,8 +838,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
                 p.setStartDateStr(sdf.format(p.getStartDate()));
             if (null != p.getEndDate())
                 p.setEndDateStr(sdf.format(p.getEndDate()));
-            if (null != p.getCreated())
-                p.setCreatedStr(sdf.format(p.getCreated()));
             p.getMembers().forEach((e) -> {
 //              e.setAge(IDCardUtil.getAge(e.getCertId()));
                 e.setSex(IDCardUtil.getSex(e.getCertId()));
@@ -888,24 +885,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             }
             List<String> str = comProjectResultsService.getNameByObjectId(p.getId());
             if (p.getProjType().equals(1)) {
-                if (null != p.getProjContent())
-                    p.setProjContent(p.getProjContent().replace("<", "&lt;"));
-                if (null != p.getProjBasis())
-                    p.setProjBasis(p.getProjBasis().replace("<", "&lt;"));
-
-                if (null != p.getResearchContent())
-                    p.setResearchContent(p.getResearchContent().replace("<", "&lt;"));
-                if (null != p.getResearchPlan())
-                    p.setResearchPlan(p.getResearchPlan().replace("<", "&lt;"));
-                if (null != p.getMainFeatures())
-                    p.setMainFeatures(p.getMainFeatures().replace("<", "&lt;"));
-
-                if (null != p.getExpectedResults())
-                    p.setExpectedResults(p.getExpectedResults().replace("<", "&lt;"));
-                if (null != p.getMemResume())
-                    p.setMemResume(p.getMemResume().replace("<", "&lt;"));
-                if (null != p.getResearchProjects())
-                    p.setResearchProjects(p.getResearchProjects().replace("<", "&lt;"));
                 WordUtils utl = new WordUtils();
                 utl.export(p, response, "word.ftl");
             } else {