新增需求1212：账号改动和新增子项目逻辑（待完善）

huzhou/src/main/java/com/easy/admin/common/util/CommonUtils.java

@@ -201,6 +201,8 @@ public class CommonUtils {
                 String[] oradmin={"市本级"};
                 projectInfoAuthSelect.setOrDutyPlace(Arrays.asList(place));
                 projectInfoAuthSelect.setAndadminDivision(Arrays.asList(oradmin));
+                String[] noDutyPlace ={""};
+                projectInfoAuthSelect.setNotorDutyPlace(Arrays.asList(noDutyPlace));
             }else if(currentUser.getNickname().equals("唐磊")){
                 String[] place ={"湖州市中医院","湖州市第三人民医院"};
                 String[] admin={"长兴县","德清县"};

huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouContractinfoMapper.xml

@@ -168,7 +168,10 @@
                     #{id}
                 </foreach>
                 <if test="info.orDutyPlace!=null">
-                    or e.duty_workplace =#{info.orDutyPlace}
+                    or e.duty_workplace in
+                    <foreach item="id" index="index" collection="info.orDutyPlace" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
                 </if>
                 <if test="info.notorDutyPlace!=null">
                     and u.duty_workplace not in
@@ -227,6 +230,7 @@
             </if>
         </where>
     </select>
+
     <select id="selectchildrenMapList1" resultType="com.easy.admin.modules.huzhou.entity.HuzhouSubProjectinfo">
         select * from huzhou_sub_projectinfo u
         <where>

huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouSubProjectinfo.java

@@ -15,6 +15,8 @@ import java.io.Serializable;
 public class HuzhouSubProjectinfo extends HuzhouProjectinfo implements Serializable {
     private static final long serialVersionUID = 376671943052847409L;
 
+    private String ismodify;
+
     private String projectId;
 
     @TableField(exist = false)

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java

@@ -2,16 +2,20 @@ package com.easy.admin.modules.huzhou.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.easy.admin.common.core.exception.EasyException;
 import com.easy.admin.modules.huzhou.dao.HuzhouSubProjectinfoMapper;
 import com.easy.admin.modules.huzhou.entity.HuzhouPlaninfo;
 import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo;
 import com.easy.admin.modules.huzhou.entity.HuzhouSubProjectinfo;
+import com.easy.admin.modules.huzhou.service.IHuzhouPlaninfoService;
 import com.easy.admin.modules.huzhou.service.IHuzhouProjectinfoService;
 import com.easy.admin.modules.huzhou.service.IHuzhouSubProjectinfoService;
 import com.easy.admin.modules.huzhou.service.IHuzhouUserprojectService;
+import com.easy.admin.modules.huzhou.vo.HuzhouPlaninfoOV;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -32,15 +36,29 @@ public class HuzhouSubProjectinfoServiceImpl extends ServiceImpl<HuzhouSubProjec
 
     @Autowired
     private HuzhouSubProjectinfoMapper subProjectinfoMapper;
+
+    @Autowired
+    @Lazy
+    private IHuzhouPlaninfoService planinfoService;
+
     @Override
     public void addSubProjectinfo(HuzhouSubProjectinfo subprojectinfo) {
-        String projectinfoId = subprojectinfo.getId();
-        subprojectinfo.setProjectId(projectinfoId);
+
+        String projectInfoId = subprojectinfo.getId();
+        ArrayList<HuzhouPlaninfoOV> planInfoMainTimelineList = planinfoService.getPlanInfoMainTimelineList(projectInfoId);
+        String isFinish = planInfoMainTimelineList.get(0).getIsfinish();
+        // 项目立项阶段完成才能添加子任务 1完成 0未完成
+        if (isFinish.equals("1")){
+            subprojectinfo.setProjectId(projectInfoId);
             subprojectinfo.setId(null);
             subprojectinfo.setStage("2");
+            //setIsModify 默认不能为空
+            subprojectinfo.setIsmodify("");
             save(subprojectinfo);
             userprojectService.saveFromProject(subprojectinfo,"1");
-
+        }else {
+            throw new EasyException("主项目立项阶段未完成,新增子项目失败");
+        }
     }
 
     @Override