政采招标oa系统
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
username@email.com
2022-07-25 6c0b60ad8577af7a2ea98fbf446e3cb83e79c776 
 zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs


@@ -1732,7 +1732,7 @@








        public IActionResult EditZhiyihan(string id = null)


        public IActionResult EditZhiyihan(string id = null, string ReturnID = null)


        {


            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));


            ViewData["curentuser"] = curentuser;


@@ -1742,7 +1742,7 @@


            {


                var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();


                if (sysCodeDtl1 != null)


                    sysCodeDtl.CodeSn = sysCodeDtl1.Comments;


                    sysCodeDtl.Classify3 = sysCodeDtl1.Comments;


            }




            //质疑函


@@ -1762,9 +1762,29 @@


                    foreach (var challengeItemDTO in challengeletterDTO.challengeItemDTOs)


                    {


                      var sysCodeDtls2 =  sysCodeDtls1.Where(x => x.Classify1 == challengeItemDTO.Question).ToList();


                        if (!string.IsNullOrEmpty(challengeItemDTO.Law) || !string.IsNullOrEmpty(ReturnID))


                        {


                            var law = "";


                        if (!string.IsNullOrEmpty(challengeItemDTO.Law))


                        {


                            sysCodeDtls2 = sysCodeDtls2.Where(x => challengeItemDTO.Law.Split(',').Contains(x.Comments)).ToList();


                                law = challengeItemDTO.Law;


                                if (!string.IsNullOrEmpty(ReturnID))


                                {


                                    law += "," + ReturnID;


                                }




                            }


                            else


                            {


                                law = ReturnID;


                            }




                            if (!string.IsNullOrEmpty(law))


                            {


                                sysCodeDtls2 = sysCodeDtls2.Where(x => law.Split(',').Contains(x.CodeSn)).ToList();


                            }




                           


                        }


                        challengeItemDTO.sysCodeDtls = sysCodeDtls2;


                    }


@@ -1843,7 +1863,7 @@


            {


                var sysCodeDtl1 = sysCodeDtls1.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();


                if (sysCodeDtl1 != null)


                    sysCodeDtl.CodeSn = sysCodeDtl1.Comments;


                    sysCodeDtl.Classify3 = sysCodeDtl1.Comments;


            }




            //if (sysCodeDtl != null)


@@ -1868,7 +1888,7 @@


            {


                var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();


                if (sysCodeDtl1 != null)


                    sysCodeDtl.CodeSn = sysCodeDtl1.Comments;


                    sysCodeDtl.Classify3 = sysCodeDtl1.Comments;


            }




            //质疑函


@@ -2198,7 +2218,7 @@


            {


                var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();


                if (sysCodeDtl1 != null)


                    sysCodeDtl.CodeSn = sysCodeDtl1.Comments;


                    sysCodeDtl.Classify3 = sysCodeDtl1.Comments;


            }


            //质疑函


            List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengeletter(id);


@@ -2219,7 +2239,7 @@


                        var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == challengeItemDTO.Question).ToList();


                        if (!string.IsNullOrEmpty(challengeItemDTO.Law))


                        {


                            sysCodeDtls2 = sysCodeDtls2.Where(x => challengeItemDTO.Law.Split(',').Contains(x.Comments)).ToList();


                            sysCodeDtls2 = sysCodeDtls2.Where(x => challengeItemDTO.Law.Split(',').Contains(x.CodeSn)).ToList();


                        }


                        challengeItemDTO.sysCodeDtls = sysCodeDtls2;


                    }


@@ -2314,7 +2334,7 @@


        }






        public IActionResult EditTousushu(string id = null)


        public IActionResult EditTousushu(string id = null, string ReturnID = null)


        {


            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));


            ViewData["curentuser"] = curentuser;


@@ -2325,7 +2345,7 @@


            {


                var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();


                if (sysCodeDtl1 != null)


                    sysCodeDtl.CodeSn = sysCodeDtl1.Comments;


                    sysCodeDtl.Classify3 = sysCodeDtl1.Comments;


            }


            //投诉书


            List<TComplaintletterDTO> complaintletterDTOs = _cooperOrderService.GetListComplaintletter(id);


@@ -2361,10 +2381,33 @@


                    foreach (var complaintItemDTO in complaintletterDTO.complaintItemDTOs)


                    {


                        var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == complaintItemDTO.Question).ToList();


                       




                        if (!string.IsNullOrEmpty(complaintItemDTO.Law) || !string.IsNullOrEmpty(ReturnID))


                        {


                            var law = "";


                        if (!string.IsNullOrEmpty(complaintItemDTO.Law))


                        {


                            sysCodeDtls2 = sysCodeDtls2.Where(x => complaintItemDTO.Law.Split(',').Contains(x.Comments)).ToList();


                                law = complaintItemDTO.Law;


                                if (!string.IsNullOrEmpty(ReturnID))


                                {


                                    law += "," + ReturnID;


                        }




                            }


                            else


                            {


                                law = ReturnID;


                            }




                            if (!string.IsNullOrEmpty(law))


                            {


                                sysCodeDtls2 = sysCodeDtls2.Where(x => law.Split(',').Contains(x.CodeSn)).ToList();


                            }






                        }




                        complaintItemDTO.sysCodeDtls = sysCodeDtls2;


                    }


                }


@@ -2717,7 +2760,7 @@


            {


                var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();


                if (sysCodeDtl1 != null)


                    sysCodeDtl.CodeSn = sysCodeDtl1.Comments;


                    sysCodeDtl.Classify3 = sysCodeDtl1.Comments;


            }


            //投诉书


            List<TComplaintletterDTO> complaintletterDTOs = _cooperOrderService.GetListComplaintletter(id);


@@ -2755,7 +2798,7 @@


                        var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == complaintItemDTO.Question).ToList();


                        if (!string.IsNullOrEmpty(complaintItemDTO.Law))


                        {


                            sysCodeDtls2 = sysCodeDtls2.Where(x => complaintItemDTO.Law.Split(',').Contains(x.Comments)).ToList();


                            sysCodeDtls2 = sysCodeDtls2.Where(x => complaintItemDTO.Law.Split(',').Contains(x.CodeSn)).ToList();


                        }


                        complaintItemDTO.sysCodeDtls = sysCodeDtls2;


                    }